Merge from trunk
authorJan D. <jan.h.d@swipnet.se>
Sun, 28 Feb 2010 14:32:51 +0000 (15:32 +0100)
committerJan D. <jan.h.d@swipnet.se>
Sun, 28 Feb 2010 14:32:51 +0000 (15:32 +0100)
commita1c187b0deac18245ce33daea2e9790fa9cbd2e1
treec4b9439335189057208d21d1fdb857c76f850c43
parent03f962ff30327b1a630e8409bb1f6422455bfcf4
parente693c5376522786c7d2c323d9bdf2cbc1e007c3f
Merge from trunk